Fix to get modals working