Merge pull request #1116 from iguananaut/issue-1112-temp

Temporary fix for #1112