Addresses an issue in which the build fails with a null pointer exception due to not being able to find the record constructor because the order of the types are not in the order specified in the constructor.