Fixing issue #146