fix for CR