is_gateway fixes