Fix command exectution, and restore points