Yet another temp fix for #1080
Merge pull request #1099 from iGemini/master

Yet another temp fix for #1080