Fixed out of range error on single builds