add timeout to fix double handler call