Hotfix: array removal