Fixing issue #32