Bugfixing case 4