Fixing issue #33