no_return is working again