Fixed the modal issue