fix for server data changes