fix setting of timeout

Change-Id: Ia8b7e0bb127761aa8541420003859eaf37ff0f45