Automatic patch attempt for helpers 2.1