Better chance at finding plaque

WARNING: could lead to infinite loop in current state.