fixed client lag
merge