Fixing issue #159