Temporary solution for fixed navigation