ticket:5 Last fixes, all tests are OK