Bug fixed in Navigator.c