One more optimisation for #24