Fix CAF detection