Fixing issue #198.