All modal issue sorted