Fixing issue #16.