[#60] Emergent fix to resolve issue #60