Re-adjusted single element check