Fixed looping, for real this time