Yes, that should probably be switched to be calculated using the prescaler also, rather than just updating the constant.    That is just setting the interrupt to fire a safe time in the future before enabling it, since the first actual pulse is turned on inside the interrupt.