Fix issue 125154