Remove comma bug