applied 2 commits to fix issues