Potentially fixed null current state bug.