Fixing issue #286.