Fix for not returning an array of arrays