Probable bugfix for infinite regen.