ticket:13 fix, tests ok, done