fail handler fix