Fixed cursor positioning
New version