Applied hotfix from 0.8.92.