Fixed the Carrier bug and fixed another bug related to wrongly named fields