Fix navigation with diffrent renderer