Safety commit because Dave's a pussy