fix guard issue again