Fix duplicated args

Fix #493
Fix #498