Fixing issue #294.