Fix to force parameters to numeric, if they can be