fixed the modal issue completely