fix forward navigation