moar bugfixing for simulator