Fixed fallback args extraction