bug and translation fix