fixes #515

on our side as requested by @jakimfett