changes for the 25k corner case