Fixed more generic array handling #2