Temporary fix for C++ array access