Fixed issue with EntryElement