Fixed cursor issue