Removed TODO -it is realized in testInput branch.
Small code fix