next try to fix

fix without changing logic and structure.