Fixed to use Stream