It seems this change is causing the bug described in #404.