#46 fixed close