More fix to serveral cycles