fixed bugs lang