Fixed another merge discrepency