Added metadata type fix.