hopefully fixes timing problems