Fixing issue pointed out in issue #1