Hackfix for the testsuite