fix issue with cursor changes