Issue 4141: Hopefully fix the test