Fix #2548: Failed unit test