Merge fix chico