Fixing comma bug