fixed Guard check