adjust to most recent matustools