Changes to resolve issue #29