Bugfix one-state-ification, changed default behavior.