stage 2 bugfixing XXII