Add better detection for the have_info