fix/fail-to-panic master