Fix modal issue