Bugfix without contorol