Close #52