Fixed ARGS parsing