client stage 2 bugfixing XXXXXV