merged runaway servers fix