Added in safety for the user using '$' or ','.