Fix for IdService