Fix/en 39 stale element reference exception