Fixes of issues 95 and 62