Fixed problem with commas and dots