fixed server overtriggering