import shoot-while-savnig fix from kex