Fix array issue