Fixed correcting optional arguments