Merge "Fix bad arguments handling"