Confirmed #74 fixed, close #74