fixed the modal issue