Fix double comma bug