Fix output to be array