Yet another potential bugfix

Bas, you wanker, try this shit out.