Fixed bug that arises in http -> http migration