Corrected modal issue