Fix confusions