Fix/improve #66 (#68)