Fixing issue #284.