Bug no 1200

Update for actors in combat.