Fixed bug with args