Fixed partial read issue