Fixing issue #369.