fix for the findbyid take 2