Finalize fix for #415