Fix for broken test in 258a14a114a37460767e1ad70f621b4365bc5a6a