Added delayed check to handle race condition