Fixing PR#123

See conversation in #123 for more details.