CRA-529 Fixed undefsum problem (hopefully)