Close #64, Close #65