Tweaked master check statement