fixes for not responding gateway case