maybe fix modal issue