After discussing with @pschwartz I agree to make this change