Fixed problem with Type attribute