Element limit with latest code