Fixes findById, uses same mechanism as other function