Hm, you are right. But it was already merged to roxy, so maybe we could work on timeout in some next commits...