fix bug with navigation