Fixing an issue identified in #116