Move the _expansionLimit prodding inside the if