prevent overcapture
Simplifiy logic