Closes #1808 Thanks @A-Metaphysical-Drama for the damage part Signed-off-by: Subv <s.v.h21@hotmail.com>