Fixed bug in EditServer