fixup: use fixed array instead of vector