Fixed errors on backward/forward navigation