mods to address issue #109