Keys containing @ mapping fix.