Changed to match reused gateway