bug fixed 2014/9/2