fixing bugs related to CR