Workaround for genericNavbar update from mopa issue 587 @mopa