Fixing issue #21