Fixing issue #126