Fix array issue?