Fixed issues with commas.