* Fixed issue with first variable state
* Fixed incorrect labels logic