added extra case for guard