Quick bug fix with cursors.