Tentative fix for issue #49