Fix bug with args shifted 2 times