tweaks for issue #1651