ticket: 5 Fixed issues