Fixing issue #16