fixed navigator class