Temporary fix for edm:type issue