Fix/en 39 stale element reference exception

Made an mistake..  Is fix for EN-38