diff --git a/cmd/csaf_checker/rules.go b/cmd/csaf_checker/rules.go
index e2fcbe9..4e210ff 100644
--- a/cmd/csaf_checker/rules.go
+++ b/cmd/csaf_checker/rules.go
@@ -182,11 +182,10 @@ func (p *processor) eval(requirement int) bool {
 	case 15:
 		return !p.badROLIEfeed.hasErrors()
 	case 16:
-		// TODO: Implement me!
-		return true
+		return !p.badROLIEservice.hasErrors()
 	case 17:
-		// TODO: Implement me!
-		return true
+		return !p.badROLIEcategory.hasErrors()
+
 	case 18:
 		return !p.badIntegrities.hasErrors()
 	case 19: