accidentally removed guard generation, restoring that