Fix change caused by merge issue