12.23 fix+++++