Performance fix

@899ec8a657e3ec657ac38f4ffddd27a3cdfe8bfb
2.53->2.54