Further bugfixing…