navigator: temporary fix for Opal bug