Compatible with ModalBar changes in Sprint 35