Fixed lingering bug in the non-match blocking code