Had gone a bit too far in previous commit