Correct state scope