Added additional logic for the check

Reviewer: Tiffany Go

Issues: None