Resolved cursor issue