Fixing issue #128