Master of Disguise 🥸 fixed some bugs by SoSpends (matrob/WR)