Fix looping on handles