Fix odd bug with map & names of attributes