1.1.7 - No longer breaks/removes IDs