issue #615 fixes