[BUG #7631] Workaround for dysfunctional requirement check