fixed cross-language mess-up