simplify bugfix