Fix #336 (though generally we should be using the computed navigator now)

Signed-off-by: Matt White <matthew.white@fclonline.com>