Fix issue that killed modals