Fix issues where you immediately go back

* Need to refactor it as it's ugly code!