bugfix from last fix