fix Dajung's bug
issue 298