Added lang fixed and buggy check