Fix retrieve from back stack