Fixes relating issue #175