ticket:5 fix after merging