Fix for bare-referenced arrays