Temporarily fixed the cursor bug