[#1200] fix more issues with pull request