unicorn change, trying to fix crash