Tentative fix for issue #336