Apply Simon's patch