Fix issue with non SSL requests