bugfix of previous commit