Fixing issue #39