clientside bugfixing