Fixed server bug