Another gateway small bug fix