Combat log need to be fixed