Fixed issue in validation