Fix CR bug