Fixed double nav problem