Fixed issues in pull request 11