Fix comma-bearing issue