ticket:3 fix issue from feedback