Hopefully this fixes the modal issue