Add Assessment Type Issue fix