Temporary Arr solution