Fixed gateway crashes