merge quang branch to mine to fix the case