Further bugfixing / fixed bug created by last bugfix