fixed expressions for arrays
merged