Bugs with array fixed