Fixing issue #242.