bug almost fixed on server side.