Avoid enemy head
Fix fallback removal
Merge remote-tracking branch 'origin/master'