Bugfixing 2