Fix for Arrays
fix for arrays
pr6 merge