staging bugfixing