Fixes critical issue with overlapping variables
This is working for adding PBXs