fix Dajung's bug