Fix issue with rolling scheme validation.