Improved combination checks