small state bug modification