Changes to analyse partial stream too