Fixed broken code caused by new Crystal naviagtion code.