Noreturn fix