Really weird bugfix
Cleanup