Shift to use the proper attribute id