Fix required for #669