Fixed issue #124 -> now adding the state property reference to the enumeration value to check if same state