Fixed bug with arguments