Fix bug and done switch language