tweaks & fix for issue #11