Added content_length protection