Fix test suite failure intoduced in #511