fix some bugs due to deprecated "angryness"