Fixes handle_indirs issue