fixed timer overlap bug