fixes (issue #18)