added in array back, this seems like a hack