Merge "Fix the bug where the order of arguments were incorrect"