Fix for server save key mapping bug