Fix skip guards