Fix regression introduced in bae432a8, Fixes #550