Potential performance fix

To test