Finally fixing NSArray