Fix problem with absent of id