Bugfixing
WIP