This part of the fix looks good though.