bugfix from previous commit