Fixing issue #26