fix bug after clean code