fixed timing problems