[2883] Improve previous commit

Thanks to everyone for the feedback provided
[2884] Fix crash for Brutallus

Thanks Azelen for the feedback

Close #60