Manually applying the fix in #239, thanks Naatan