someodd integrating pazz0's patch