Fixed #5: Edge gateway modification doesn't work