tweak for issue #311