Switched to ArrayUtils