partially fix the close/open problem