fixes (issue #22)