Fixed ordering of the primitive types, everythings good to go.