fixes (issue #21)