add some more checks for timing problems