Bugfix for test suite