bugfix of last commit