improvements for issue #2 fix based on Abhoryo PR comments