Fix comma skipping