Fix fail by merge