Up navigation lag bug fixed