fix cutoff issues