stong More aggressive performance fix