fix 130 and Dajung's bug