added check on application