Fix for server-edit related bug