fixes #919 for @Yogurt1206 what do you think... does this look okay