Fix Fling + Gem
Merge pull request #1097 from turbedi/patch-1

Fix Fling + Gem