Back button temporary fix