Added IncompleteRead handling