Cursor Fixed (Tina's version commited by Rasheed)