reuse of gateway object fix