fix bugs
from server