Fixed returning struct type as array