Fix for #158

See discussion in issue #158.

Ben :+1: