Tentative fix to #312