Fix removal of Substitute
Max damage is not enforced due to Sub.
Minor tweak to sub