Revert "Revert "change timer fix broken""

This reverts commit 0a05840b8b4dd87ddded45b047625e321be87afd.
shorten timeout