Sync with mac's version