Impleenting cursor fix CONTRIB-4538