Would have prevented #3440
Would have prevented #3440