Correcting recent merge