Bugfixing #2