fixes #515

on our side as requested by @jakimfett
Merge pull request #543 from way2muchnoise/master

fixes #515