Potential bugfix attempt 2

Bas. Test this.