Fix comma problem