Fix for CR