CR related fix