Fixed server issue