fix for commas etc