Fixed an issue with modals