stage 2 bugfix