Fixing attacking objects
merge
1