Improve bailout function