Fixed carrier bug