fixed some bug  - 20 gen 13