code fix after merge.