Fix for ContentLength logic