Update with @hawknewton's suggestion