ARMORY-180 Fix Helgabutters' bugs
#6