Problem: PR #31 clobbered PR #30

Solution: Restore changes from PR #30