Another unicorn fix