Tentative fix on gatewaybug