Structkeyexists fix