Tentative fix for issue #84