Fix usage as well