fix to find correct id