Fix for issue #114

See #114.