Fixing comma grr