Fix cutoff management