Attempt to fix generic array issue