fixing bugg, look to be server side