Temp fix for modal issue