lastminute bugfixing