some fixies for issue #12