Applied Simon's patch