ugly berserker fix+ tweak