Fixing issue #107

Have to check this.