Tentative fix for issue #54.