changes to fix the attack