Addition of previous bugfix. Adjusting cursor positioning.