[#1200] fixes from pull request