Fix 4231

Fix #4294 after a regression caused by #4231

ping @weierophinney, @davidwindell, @danizord, @netiul