fixed some timing