Fixing issue #37