I made a better fix for this here: e6cf92d16471d728087bdabe803a389ba991080d