Attempt fix for issue #323.