Fix bug with unicorn task, close #18