Fixing bug where attribute names get normalized