Fixes #521

This should fix #521

Signed off by SleePy