fixed safe state variable lists