navigation fix continued