Quick fix for server