Back navigation issue fix