This seems like an over-optimization. Is this really needed?