code cleaning + close #225
hotfix