RuiHKUST fix all zero returns case