added additional Check