#369 Fixed with unit test.

Please, review.
I didn't understand this text. This TODO will become a task for someone else soon. It has to be descriptive enough to become able to be fixed. Please, explain here what exactly do you want someone to do and what should be the result