Fixed bug caused by new argument handling