Fixing issue #301.