Temporary fix for commas