fix gw marking