Updates to support issue #12