apply the previous fix to arrays, too