stateful fixes