bugfixing in last commit