Again, you might post your customizations for this file before you submit it to the add-ons to ensure the fixes are complete ...