Fixed up cursor iteration more properly(?)