Navigator: fix for the previous fix