fix from pull request for stability