Try a fix for unicorn