Fixed server problem