StateDevice -> Fix bug with map command.