Andrew posted a diff fix that i think we should use instead
-mike