Added fix to var names in continue guards