Bugfix for tests on 1.3.7