Fixing issue #34