Added primitive parse fix