Back button bug fixed