fix for server compatibility