Bugfixing item 6