Another attempt at fixing the timing issue