CEP-431 dirty fix for wildcard issue (basisschol)