ticket:10 fixing according to comments
fixing conflict