I guess that previous merge wasn't as clean as I thought