Adding mattn's un-breaking tip patch