Fix for issue #302

Per discussion on the issue. Look OK?
Yes please, I'd prefer to keep the CL just about the content-length.