Fixing args parsing