improve robustness with lost focus
2 files changed