ConstructionMode: redirect fix