fix nil carrier bug