Revert "Revert "Fixed StateFigure to InitialStateFigure Exception""

This reverts commit ecaa460993e22da61ebecb9a244ed38041f944f5.