Fix issue with start state and nested arrays etc