Workaround for scala compiler derp
Merge pull request #1307 from bdew/master

Workaround for scala compiler derp