[LanguageSystem] Fixed #36