Problem found and fixed in g_combat