Fix state leakage from msby spec