Mix up array and case nextState for consistent behaviour #2