BugFix: Fixed EndOfStreamException