fix 385 and Dajung problem