Sorry, I  hurried and made mistakes in previous commits. I hope it is well and really final solution.