Fix bug with arguments parsing, working now