tentative fix for issue #6