Mods to address Issue #87