fixes (issue #20)