fix for order of back/forward

Change-Id: I90c8b0ccd35d7a760c62f3506dbb59e3128eeb70