HAL-191: Bugfix for deferred navigation