fixed Phuong's bug