Fixed delay for #37