Fixed to use stream, instead of string