May help with the failed tests (not reproduced locally). re #49, #48