fix issues with last pull request