Fix for crash with HEE