fixed: lang issues