The ordering of the fields was inconsistent - this should sort it out so the class can work correctly