Previous optimization was a little too 'clever'