Fix for "Multiple variables with sets in a single state #24"

Fix for "Multiple variables with sets in a single state #24"...