Multi languages fix