additional tweaks for issue #8