avanti_catch_fix