Fixed Array issues