Fixing issue #306.