Stat/Timer fix