Manually added fix from pull request #1838
Updated Version 3.0.19.056