Bug fix, should be a flat array