Last-minute workaround for iCore bug.