Fix for parser - already parsed by id not references