StateDevice -> Fix bug with multiple substates