Remove timeout from listener
0.3.1