Fixed issue sending deprecated fields