seems your dual state fix also fixed the wrapper-blocking-button glitch (might have been a symptom of the dual-state glitch)