12.22 fix+++++++++