Fixed guardian generation.