Finalize fix for #458