Whaaat another bugfix

This is getting stupid