Cleans up bad Array usage
Fixes the bug