ticket:5 fix all issues