Fixing issue #215.