patch from CAF