Base: Fix goBack function