Cursor + Map fixed