Fix rare case of command not working right after an update