fix and close #50