Fix for current set of CR comments