Bugfixing for 3.5