Fix [2099067b84]
Fix regression [29a67a72c9]
3.0.11
Keep it DRY