minor adjustments - issue #311