Blind fix for #885

Tested this locally and I can't reproduce the reported errors and there aren't any new regressions.