Tenative fix for issue #323.