Fixing issues with commas and saving