#12 Bugfixing