fix for public_id issue