fixing navigation between buffers