MAINT: implemented more careful handling of cutoff parameter