minhnguyen - fix bug