fix last bug on 6/6/2014