Bugfix

close #18