Ok, please let me know if this patch works (generated against 1.2.7):