production bug fix for before_cutoff