Fixed Some Bugs in SHAA Class