Don't forget to pass kwargs to commands run in if clause