ticket:9 fix after merge