Fix #706.
Bad state-tracking fail