Resolved setting metadata for the wrong properties