Slightly different version of OCD-fixing patch.