Bugfix close #9