Fixed problem with arguments parsing