Is this meant to be an optimization?