simplified bugfix