attempt to fix the timezone issues in the combat tool