fixing lang issues