Bugfixing item 10