[WP] Cycle condition optimization