#143 re-enabled the gateway feature