Minor patch: check only match @STRENGTH and remove eNULL