fixed 12500 issue