added couple checks for native cursor