Fixed issue #1445 again: bug on serialization of timeout