Minor bug with state labelling