fix and close #402