[FIX] Better arg handling