Fixed support more arguments.