Can we fix the below array properly so you don't need this?