Hotfix: Prevents #115 from happening, this not a proper fix.

This might open a lot of other issues again, so this is really just a dirty hack for now, to be done properly later on.