fixed stuff from navigator