close #13 Bugfix