Attempt to fix modals