Merge pull request #349 from Dmitry-Me/properHandleSmallBufferOnCe

Don't use -1 as buffer length