Re: [Patch] fix gateway for new systems