#56 fix and bugfix