Fixing comma issue