Reverted the 'optimization', as it caused results to be missed.