Modal close tentative fix