fixed and close #11