[FIX] some fields were replaced incorrectly now, they are good