bugfix from last commit