fix unicorn bugs