Fixing issue #353.