Resolved bugs with attack