making changes to support Issue #120