Add even more protection against multiple commands