Better evil commands protection