Fixed up loop support