#19 Bugfixing