Fix issue caused by merge