Fixed handling of newly introduced generic array