Fixing issue #19