fixed loss after merge