Fix for NSArray