Fix CR by pmwkaa