PIM-2019 : fix detached entty issue