Merge fix for cursor