This should make return from anywhere work correctly.