Fixed issue with array types