Fixes #1617
If there is an array available, use it